Rebasing the lock-decoration branch onto current main pulled in the newer grouped CHANGES tree and idle-session naming. The lock-decoration regression stayed real, but its test still expected the older direct child shape, so this follow-up updates the assertions to match the nested Repo root group and the current activation timing.

Constraint: The finish flow requires a clean source worktree before it will rebase, open the PR, and clean up the branch

Rejected: Re-run finish against the stale rebase worktree | agent-branch-finish.sh stops on dirty or conflicted source worktrees

Confidence: high

Scope-risk: narrow

Directive: When rebasing Active Agents coverage onto newer main, check whether repo-root CHANGES grouping or session activity labels moved before trusting old assertions

Tested: node --test test/vscode-active-agents-session-state.test.js; openspec validate agent-codex-vscode-tree-lock-decorations-clean-2026-04-22-11-09 --type change --strict

Not-tested: Interactive VS Code rendering